Install gpsbabel.html only.

Remove php-ized htmldoc folder.
The whole documentation is available as pdf anyway.

Closes: #755457
Thanks: Axel Beckert

diff --git a/debian/gpsbabel-doc.doc-base-common b/debian/gpsbabel-doc.doc-base-common
index 9a5224ad8ff403fb18298cda2a26b7b68ee53196..68cc45d9d44f148a524f5ff85a0094b748d5a4f8 100644 (file)
--- a/debian/gpsbabel-doc.doc-base-common
+++ b/debian/gpsbabel-doc.doc-base-common
@@ -3,6 +3,6 @@ Title: gpsbabel filter and format documentation
 Section: Science/Geoscience
 
 Format: HTML
-Index: /usr/share/doc/gpsbabel/htmldoc/index.html
-Files: /usr/share/doc/gpsbabel/htmldoc/*.html
+Files: /usr/share/doc/gpsbabel/gpsbabel.html
+Index: /usr/share/doc/gpsbabel/gpsbabel.html
 

diff --git a/debian/gpsbabel-doc.doc-base-pdf b/debian/gpsbabel-doc.doc-base-pdf
index c2544cd4f0f6a9b9d4f003dd8e0257cd6723e6bb..25c5b5b9e39e9f12b883b3e779ae2f69eed922ce 100644 (file)
--- a/debian/gpsbabel-doc.doc-base-pdf
+++ b/debian/gpsbabel-doc.doc-base-pdf
@@ -1,3 +1,3 @@
 Format: PDF
-Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz
+Files: /usr/share/doc/gpsbabel/gpsbabel.pdf
 

diff --git a/debian/rules b/debian/rules
index eff130d9e602f81792caa8b1143efb66eea78cb4..b89f7a7106dd632f7578660e7ed254b9c0fe9df6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -81,14 +81,17 @@ endif
 
 # We need a gpsbabel binary to build the documentation.
 build-doc-stamp: build-stamp
-       $(MAKE) -C gpsbabel $(DOCTEMP)/htmldoc-devel/index.html WEB=$(DOCTEMP) DOCVERSION=devel
+       mkdir -p debian/doctmp/htmldoc-devel
+       cd gpsbabel && perl xmldoc/makedoc && cd ..
+       $(MAKE) -C gpsbabel gpsbabel.html
+       cp gpsbabel/gpsbabel.html debian/doctmp
        cp $(CURDIR)/debian/gpsbabel-doc.doc-base-common $(CURDIR)/debian/gpsbabel-doc.doc-base
 ifneq (mips,$(HOSTARCH))
        $(MAKE) -C gpsbabel gpsbabel.pdf WEB=$(DOCTEMP) DOCVERSION=devel
-       rm -f $(CURDIR)/$(DOCTEMP)/htmldoc-devel/gpsbabel-$(DOCVERSION).pdf DOCVERSION=devel
        cp gpsbabel/gpsbabel.pdf $(DOCTEMP)
        cat $(CURDIR)/debian/gpsbabel-doc.doc-base-pdf >> $(CURDIR)/debian/gpsbabel-doc.doc-base
 endif
+       rm -rf debian/doctmp/htmldoc-devel
        touch $@
 
 build-gui: build-gui-stamp
@@ -141,9 +144,6 @@ install-arch: $(BUILD_TARGETS_ARCH) install-prep
        dh_install -a 
 
 install-indep: $(BUILD_TARGETS_INDEP) install-prep
-       # Rename htmldoc dir
-       mv `ls -d $(CURDIR)/debian/doctmp/htmldoc-*` $(CURDIR)/debian/doctmp/htmldoc
-
        dh_install -i
 
 
@@ -156,7 +156,7 @@ binary-indep: build-indep install-indep
        dh_installchangelogs -i 
        dh_installdocs -i
        dh_link -i 
-       dh_compress -i
+       dh_compress -i -X.pdf -X.html
        dh_fixperms -i
        dh_installdeb -i
        dh_gencontrol -i
@@ -172,7 +172,7 @@ binary-arch: build-arch install-arch
        dh_installman -a
        dh_installmenu -a
        dh_strip -a
-       dh_compress -a
+       dh_compress -a -X.pdf -X.html
        dh_fixperms -a
        dh_installdeb -a
        dh_shlibdeps -a